Skip to content

Keep Bluetooth Proxy on for legacy BLE builds - #93

Merged
bharvey88 merged 2 commits into
betafrom
fix/ble-proxy-restore-on
Aug 18, 2026
Merged

Keep Bluetooth Proxy on for legacy BLE builds#93
bharvey88 merged 2 commits into
betafrom
fix/ble-proxy-restore-on

Conversation

@bharvey88

@bharvey88 bharvey88 commented Jul 29, 2026 •
edited by coderabbitai Bot
Loading

Copy link
Copy Markdown
Contributor

Version: 26.7.29.1

What does this implement/fix?

The Bluetooth Proxy switch does restore from flash, but the _OFF half of
RESTORE_DEFAULT_OFF only decides the boot where nothing is stored yet, which is
the first boot after the switch shipped. MSR-2_BLE.yaml inherited that mode from
Core, so a legacy BLE device that had always proxied comes up with the proxy off
after updating and stays that way until the user finds the switch. Reported in #92.

Core now reads the mode from a bluetooth_proxy_restore_mode substitution
defaulting to RESTORE_DEFAULT_OFF, and MSR-2_BLE.yaml overrides it to
RESTORE_DEFAULT_ON, the same override pattern that file already uses for its OTA
manifest URLs. The unified image is unchanged, and a user's saved choice still wins
on every later boot.

Validated with esphome config on 2026.7.2 across MSR-2.yaml, MSR-2_BLE.yaml
and MSR-2_Factory.yaml. Rendered switch: standard RESTORE_DEFAULT_OFF, BLE
RESTORE_DEFAULT_ON.

Matching PRs go to AIR-1, MSR-1 and MTR-1, which carry the identical switch and BLE variant.

Types of changes

  • Bugfix (fixed change that fixes an issue)
  • New feature (thanks!)
  • Breaking change (repair/feature that breaks existing functionality)
  • Dependency Update - Does not publish
  • Other - Does not publish
  • Website of github readme file update - Does not publish
  • Github workflows - Does not publish

Checklist / Checklijst:

  • The code change has been tested and works locally
  • The code change has not yet been tested

If user-visible functionality or configuration variables are added/modified:

  • Added/updated documentation for the web page

🤖 Generated with Claude Code

Summary by CodeRabbit

  • New Features
    • Added configurable Bluetooth Proxy state restoration for first boot and factory reset scenarios.
    • BLE devices now restore the Bluetooth Proxy as enabled by default, helping maintain proxying after updates.
  • Updates
    • Updated the ESPHome package to version 26.8.18.1.

@bharvey88
Keep Bluetooth Proxy on for legacy BLE builds
54c9d94 
The Bluetooth Proxy switch does restore from flash, but the _OFF half of
RESTORE_DEFAULT_OFF decides the boot where nothing is stored yet, which is
the first boot after the switch shipped. MSR-2_BLE.yaml inherited that mode
from Core, so legacy BLE devices that had always proxied came up with the
proxy off after updating.

Core now reads the mode from a bluetooth_proxy_restore_mode substitution
defaulting to RESTORE_DEFAULT_OFF, and MSR-2_BLE.yaml overrides it to
RESTORE_DEFAULT_ON, the same override pattern the file already uses for its
OTA manifest URLs. The unified image is unchanged and a user's saved choice
still wins on every later boot.

Refs #92

🤖 Generated with [Claude Code](https://claude.com/claude-code)
@bharvey88 bharvey88 added the bugfix Bug fix label Jul 29, 2026
@coderabbitai

coderabbitai Bot commented Jul 29, 2026 •
edited
Loading

Copy link
Copy Markdown

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Organization UI

Review profile: CHILL

Plan: Pro Plus

Run ID: cd3e8800-17c9-4178-82ea-a2a8fff6b121

📥 Commits

Reviewing files that changed from the base of the PR and between 54c9d94 and cd59f31.

📒 Files selected for processing (1)
  • Integrations/ESPHome/Core.yaml
🚧 Files skipped from review as they are similar to previous changes (1)
  • Integrations/ESPHome/Core.yaml

Included review availability: Your plan includes up to 1 review per rolling hour; 0 remain after this review.

Walkthrough

ESPHome now supports a configurable Bluetooth Proxy restore mode. The core default is disabled. The BLE configuration sets the mode to restore enabled. The package version and boot comment were updated.

Changes

Bluetooth Proxy restore behavior

Layer / File(s) Summary
Configurable core restore mode
Integrations/ESPHome/Core.yaml		 Adds bluetooth_proxy_restore_mode with a default of RESTORE_DEFAULT_OFF, wires it into bluetooth_proxy_switch, updates the package version, and clarifies BLE scanning behavior.
BLE restore override
Integrations/ESPHome/MSR-2_BLE.yaml		 Sets bluetooth_proxy_restore_mode to RESTORE_DEFAULT_ON for legacy BLE devices.

Estimated code review effort: 2 (Simple) | ~10 minutes

Merge Risk: ⚪ Minimal · up to cd59f

The change is localized to BLE proxy restore defaults, and no actionable merge-blocking risk remains after normal checks and review.

Poem

A rabbit checks the proxy state,
Core keeps it off by default.
BLE devices restore on,
Boot comments guide the dawn.
YAML hops through version gates.

🚥 Pre-merge checks | ✅ 5
✅ Passed checks (5 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly describes the main change: keeping the Bluetooth Proxy enabled for legacy BLE builds.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch fix/ble-proxy-restore-on

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@bharvey88
Bump version to 26.8.18.1
cd59f31 
Re-dated for the merge day per versioning policy.

🤖 Generated with [Claude Code](https://claude.com/claude-code)
@bharvey88
bharvey88 merged commit ce8414f into beta Aug 18, 2026
13 checks passed
@bharvey88
bharvey88 deleted the fix/ble-proxy-restore-on branch August 18, 2026 15:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@bharvey88 bharvey88

Labels

bugfix Bug fix

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@bharvey88